snapshot: Move GtkSnapshot declaration to gtypes.h

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 954b1d3939758ccc4c28b46837c5159a30fc6ad7..2f423cb9aed0456d7c6befd0474a676c501ea2a5 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -35,6 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkrender.h"
 #include "gtksizerequest.h"
+#include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnodeprivate.h"

diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c
index 547fc35a2aa788e0a7006b0b1cb0207230d6c512..4102dd95eeb632783d3cb20dfdaa39d639653861 100644 (file)
--- a/gtk/gtkbuiltinicon.c
+++ b/gtk/gtkbuiltinicon.c
@@ -24,6 +24,7 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkrendericonprivate.h"
+#include "gtksnapshot.h"
 
 /* GtkBuiltinIcon is a gadget implementation that is meant to replace
  * all calls to gtk_render_ functions to render arrows, expanders, checks

diff --git a/gtk/gtkdebugupdates.c b/gtk/gtkdebugupdates.c
index 7aa80b871a589600429d95410dc6a252dbc1a54c..b1d0cf3b5214ee544b97efd9c146b46e79b1665b 100644 (file)
--- a/gtk/gtkdebugupdates.c
+++ b/gtk/gtkdebugupdates.c
@@ -19,6 +19,8 @@
 
 #include "gtkdebugupdatesprivate.h"
 
+#include "gtksnapshot.h"
+
 /* duration before we start fading in us */
 #define GDK_DRAW_REGION_MIN_DURATION 50 * 1000
 /* duration when fade is finished in us */

diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 1a5849e2949c86f00fb6b05976db2d98a6fc2603..7d4f2ef87dd29173446820ea9686611924e1f486 100644 (file)
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -26,6 +26,7 @@
 #include "gtkdrawingarea.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
+#include "gtksnapshot.h"
 #include "gtkstylecontext.h"
 
 typedef struct _GtkDrawingAreaPrivate GtkDrawingAreaPrivate;

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 98b036220055132af7bd3cbddaba9ebe8788f22a..f3b66216a6aa3ea604129aa100407b3135fff762 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -31,6 +31,7 @@
 #include "gtkcsstransientnodeprivate.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkrendericonprivate.h"
+#include "gtksnapshot.h"
 
 struct _GtkIconHelperPrivate {
   GtkImageDefinition *def;

diff --git a/gtk/gtkrenderbackgroundprivate.h b/gtk/gtkrenderbackgroundprivate.h
index ed931ab52aae6641bec2966d5e4f42ffde6639e3..e4bf2ba599d8e5835e6871b7d45ec53cceb21546 100644 (file)
--- a/gtk/gtkrenderbackgroundprivate.h
+++ b/gtk/gtkrenderbackgroundprivate.h
@@ -24,7 +24,6 @@
 #include <cairo.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtksnapshot.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkrenderborderprivate.h b/gtk/gtkrenderborderprivate.h
index e05a664c7da37cfa8c413643ce3b64056f54dd50..214560b35a642910eb681678d16f9fb2b498df91 100644 (file)
--- a/gtk/gtkrenderborderprivate.h
+++ b/gtk/gtkrenderborderprivate.h
@@ -25,7 +25,7 @@
 #include "gtkborder.h"
 #include "gtkcssimageprivate.h"
 #include "gtkcssvalueprivate.h"
-#include "gtksnapshot.h"
+#include "gtktypes.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkrendericonprivate.h b/gtk/gtkrendericonprivate.h
index 8b12d135bb2af1255515de066ceff173b2ba97a3..6a3ca4b9119dd085b914fef685f9fe56c626a4e1 100644 (file)
--- a/gtk/gtkrendericonprivate.h
+++ b/gtk/gtkrendericonprivate.h
@@ -25,7 +25,6 @@
 #include <gsk/gsk.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtksnapshot.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtksnapshot.h b/gtk/gtksnapshot.h
index 0bfaa54967bbf38e5eaed444526daab56d565cec..e9811325506afc16ddb249e98d01a1bb13760bde 100644 (file)
--- a/gtk/gtksnapshot.h
+++ b/gtk/gtksnapshot.h
@@ -36,9 +36,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GtkSnapshot GtkSnapshot;
-
-
 GDK_AVAILABLE_IN_3_90
 GskRenderer *   gtk_snapshot_get_renderer               (const GtkSnapshot      *snapshot);
 

diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 72bc9f6f0653c73e71712296a3d3aa22b007b811..07b8f4e1520179a5f8c511fedf0cdbfaae547f09 100644 (file)
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -37,6 +37,7 @@ typedef struct _GtkClipboard         GtkClipboard;
 typedef struct _GtkRequisition        GtkRequisition;
 typedef struct _GtkSelectionData       GtkSelectionData;
 typedef struct _GtkSettings            GtkSettings;
+typedef struct _GtkSnapshot            GtkSnapshot;
 typedef struct _GtkStyleContext        GtkStyleContext;
 typedef struct _GtkTooltip             GtkTooltip;
 typedef struct _GtkWidget              GtkWidget;

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 911f3ba839cd517ecd8a1309fb3cf02a02836247..25d6de49c1b7f52e93cf875fc8e0f0cf87b33a54 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -33,7 +33,6 @@
 #include <gsk/gsk.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkborder.h>
-#include <gtk/gtksnapshot.h>
 #include <gtk/gtktypes.h>
 #include <atk/atk.h>
 

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 971dc1fd521ce79b0e3459fb48f95e389a095f7e..7fcbbb479623b1e2c967754959ac9da5f03a707b 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -31,7 +31,6 @@
 #include "gtkeventcontroller.h"
 #include "gtkactionmuxer.h"
 #include "gtksizerequestcacheprivate.h"
-#include "gtksnapshot.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/inspector/rendernodeview.c b/gtk/inspector/rendernodeview.c
index c1bd18675a43758f3ededed9911027da3eb98a92..7757fb511c04b3ff66bc92553cf1d68395fa326a 100644 (file)
--- a/gtk/inspector/rendernodeview.c
+++ b/gtk/inspector/rendernodeview.c
@@ -23,8 +23,9 @@
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
+#include <gtk/gtksnapshot.h>
+
 #include "gsk/gskrendernodeprivate.h"
-#include "gtkwidgetprivate.h"
 
 #include "fallback-c89.c"